merge
authorIan Campbell <ian.campbell@xensource.com>
Tue, 20 Mar 2007 14:34:53 +0000 (14:34 +0000)
committerIan Campbell <ian.campbell@xensource.com>
Tue, 20 Mar 2007 14:34:53 +0000 (14:34 +0000)

Trivial merge